Merge changes from topic "am-64164ce1-ff56-4245-9220-d9d51d6ed79f" into nyc-dr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] CTS test for Android Security b/35421151 am: cd192273f1
  [RESTRICT AUTOMERGE] CTS test for Android Security b/35421151