[automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android...
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72496121 b/30148882" into oc-dr1-dev am: 9a79a162 -s ours
am skip reason: Change-Id I50dc11180b384bcff46c04adcc9a2b601a2e4035 with SHA-1 a16fd155 is in history
Change-Id: If9252b406f0345ca90e3526bf47fdfdf115e6791