Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/36035683" into oc-mr1-dev