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