Merge changes from topic "am-60a9304c-562d-4f33-9fce-85c87d8c948c" into nyc-mr1-dev
* changes:
[automerger] CTS test for Android Security b/113260892 am: fd9c52bf am: c86f23bd
[automerger] CTS test for Android Security b/113260892 am: fd9c52bf
CTS test for Android Security b/113260892