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