Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/33139050" am: 058149f4 am: 204c07df Change-Id: Ice1ea6d46fcc73a9b99e078f4fe560395344e330