Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72507797 b/28377502" into nyc-dev