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