Merge "CTS test for Android Security b/37093318" into oc-dev am: 3ccf8bd9be am: 50befdaf88
am: cdf8efbbfe

Change-Id: I7cce101844fdb0ba2c41ddf1de36b2296238712d