Merge "CTS test for Android Security b/72460312 b/35258579" into oc-dev am: 68e178e580 am: 42f9d12848
am: 1bc6861dcf

Change-Id: Ifddc378900ec415e24c65b9adf855ad7320f511e