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