[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

Change-Id: I0f2c49a787d8406924b88a0f62b94bac57ff6d56