Merge "CTS test for Android Security b/28760453 b/71909578" into oc-dev
am: e4a1bd658a

Change-Id: If4a4477fde2669582c931b18b46adbfc9221970e