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

Change-Id: Ia859bf036885b1801ed76a8679c6db5fa3e45c05