Merge changes from topic "am-55b18ef7-2d60-400d-b48d-5fe16d33f7ac" into nyc-dr1-dev

* changes:
  [automerger] CTS test for Android Security b/23285192 am: f28c6f29d2
  CTS test for Android Security b/23285192