Merge "CTS test for Android Security b/72508851 b/27555981" into oc-dev am: f4f8acad4b
am: 67606e4b7e

Change-Id: I997086634f02d15967942f0062220197ed85e135