Merge "CTS test for Android Security CVE-2017-13289" into oc-dev am: 8380fde954
am: 72397c7f5d

Change-Id: Iab24007ad2be587873cd8f14fddd256ea8039a87