[automerger skipped] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/33139050" am: 058149f4 am: 204c07df am: fd65dbdd -s ours am: 8df7a35a -s ours am skip reason: subject contains skip directive Change-Id: I4126d534fb6cc186aa6177420a28203a5c61f0e2