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