Merge changes Iedfda4c9,I6c92b4c4 into oc-mr1-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/33551775
  [RESTRICT AUTOMERGE] CTS test for Android Security b/38496660