Merge changes from topic "am-68e4c8fb-3a05-4562-974c-cc289793233f" into nyc-mr2-dev
* changes:
[automerger] CTS test for Android Security b/26399350 am: 92b104f9 am: 3978a707
[automerger] CTS test for Android Security b/26399350 am: 92b104f9
CTS test for Android Security b/26399350