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