Merge changes from topic "am-018084d8-8c96-4a49-a79c-5d127ecfadef" into nyc-dr1-dev

* changes:
  [automerger] CTS test for Android Security b/70637599 b/74612696 am: f5b6e7a848
  CTS test for Android Security b/70637599 b/74612696