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