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