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