Merge "CTS test for Android Security b/72460312 b/35258579" into oc-dev
am: 68e178e580

Change-Id: If075d3265f0323d15d95322e324d78e848e26251