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