Merge "CTS test for Android Security b/72507125 b/27532522" into oc-dev am: 62155ffae2 am: 8724701ca0
am: 018ca5501b

Change-Id: Iac9d7dfd06884eab558742911b72902932781fa3