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