[automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev am: 41e52fe9cd  -s ours am: 981961cb4d  -s ours
am: fba2aa165c  -s ours

Change-Id: I0b3dc6166592605b1a323c47d9b627c63fb84f40