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