[automerger skipped] Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/37094889" into oc-dev am: d53cded1d3 am: 3337378019 am: 79795c5e99 -s ours am: fc0aa7a18b -s ours am: 0a49890872 am: 648131a3f3 am: e10535f425

Change-Id: I8a89c7ba6fc42593798ef10e07636873225aac9f