Merge changes from topic "am-09b087e9-6252-4c54-aa0c-31699f4c1005" into nyc-mr1-dev
* changes:
[automerger] CTS test for Android Security b/25928803 am: 5a1647ba am: 3303e1e2
[automerger] CTS test for Android Security b/25928803 am: 5a1647ba
CTS test for Android Security b/25928803