Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103" into oc-dev
am: b32ad4ca0c

Change-Id: Ie42be59181690d5a200d2751504902284860ad6f