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

Change-Id: I3b4c79d60cdf4356100e060408382c1b1514730d