Merge changes from topic "am-09b087e9-6252-4c54-aa0c-31699f4c1005" into nyc-dr1-dev

* changes:
  [automerger] CTS test for Android Security b/25928803 am: 5a1647bab1
  CTS test for Android Security b/25928803