Merge changes from topic "am-48c612d1-68aa-469b-a575-6646543f9504" into nyc-mr1-dev

* changes:
  [automerger] Revert "CTS test for Android Security b/24157524" am: 40495120a0 am: e0f178fe36
  [automerger] Revert "CTS test for Android Security b/24157524" am: 40495120a0
  Revert "CTS test for Android Security b/24157524"