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