[automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/27903498 b/72507578" into oc-dev am: dfc8e7557a am: ceb21077a1 am: a9c639f08c -s ours am: 824a8229a8 -s ours am: fb708ad0e0 am: cba6dd113e

Change-Id: I6cfb93d01988d61d53e5aa8a0a4094c0265a71ed