Merge changes from topic "am-f09a9ecb-36ab-48ad-9891-c5de5d437800" into nyc-dr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981 am: 41f2ae7bd4
  [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508851 b/27555981