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