Merge changes from topic "am-08df2b73-3aac-4f65-8391-a969ea64b1e7" into nyc-dr1-dev

* changes:
  [automerger] Revert "CTS Test for Android Security b/74612220 b/68399439" am: c90bb4b67f
  Revert "CTS Test for Android Security b/74612220 b/68399439"