Merge changes from topic "am-407552d7-9dd0-474d-b519-a59439de3d27" into nyc-mr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] CTS test for Android Security b/33450635 am: 9b0fd18cb9 am: ab52dcbee7
  [automerger] [RESTRICT AUTOMERGE] CTS test for Android Security b/33450635 am: 9b0fd18cb9
  [RESTRICT AUTOMERGE] CTS test for Android Security b/33450635