Merge "CTS test for Android Security b/72508851 b/27555981" into oc-dev am: f4f8acad4b am: 67606e4b7e am: 4b79f71409 am: 8a30e14cbd
am: 51d43436e9

Change-Id: Id5793df4e735863fdbf8b14c6b73c85d912e7d9d