Merge "CTS test for Android Security b/65853158 b/72396737" into oc-dev am: 7298250ea2
am: bea44de9d6

Change-Id: Id1cc1eb75675472a0ae329ef1491f6ac02ccd99e