[automerger skipped] Merge "Merge "Revert "CTS test for Android Security b/72507125 b/27532522"" into pie-cts-dev am: 2d70214c5b" am: d20630592e
am: c9bcf7cdca  -s ours

Change-Id: I3520620b697f95c5f3c8f521324d7f9115dc9158