Merge "Revert "CTS test for Android Security b/137879783"" into oc-dev