[automerger skipped] Merge "Revert "CTS test for Android security b/28026365"" into pie-cts-dev am: b107c062c6  -s ours
am: b6a3aa2638  -s ours

Change-Id: I1c6a1542714fd54dc6e93e458ee3d7e4b66571e9