[automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103" into oc-dev am: b32ad4ca0c am: 86990672b1 am: bd1ef217ab  -s ours
am: b19203e123

Change-Id: I9a7c5a829e8f77f00747945188f7b60edbcfc124