Merge changes from topic "am-9fed7762-1c53-4647-9bc3-1e1194c37b76" into nyc-mr2-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: 10c66eee16 am: 3669f82354 am: 53abe96efe am: cfc2f4f53b
[automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: 10c66eee16 am: 3669f82354 am: 53abe96efe
[automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: 10c66eee16 am: 3669f82354
[automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103 am: 10c66eee16
[RESTRICT AUTOMERGE]: CTS test for Android Security b/72508263 b/27597103