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

Change-Id: Ic46319263d71b515ecae7717eaf19f426abb5b27