Merge changes from topic "am-08cbbcc4-b797-486c-8b18-db288709c2fc" into nyc-mr2-dev
* changes:
[automerger] CTS test for Android Security b/37627194 am: 94126d9bff am: f122a624ef am: f055f71238 am: aa6167607d
[automerger] CTS test for Android Security b/37627194 am: 94126d9bff am: f122a624ef am: f055f71238
[automerger] CTS test for Android Security b/37627194 am: 94126d9bff am: f122a624ef
[automerger] CTS test for Android Security b/37627194 am: 94126d9bff
CTS test for Android Security b/37627194