Merge changes from topic "am-b1a8f9ba-e72c-4c3f-8b54-0feea7b8d0cb" into nyc-mr2-dev

* changes:
  RESTRICT AUTOMERGE: Merge commit '0995172635da5227dfc14ca35754c021de6f60b7' into am-b1a8f9ba-e72c-4c3f-8b54-0feea7b8d0cb
  [automerger] RESTRICT AUTOMERGE: CTS test for Android Security b/35467458 b/72388981 am: 3ac8a06d2f
  RESTRICT AUTOMERGE: CTS test for Android Security b/35467458 b/72388981