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