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