Merge changes from topic "am-d272918e-a99d-4306-988b-0886b4086a2c" into nyc-dr1-dev

* changes:
  [automerger] Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453" am: c2795f89b1
  Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453"