Merge changes I934118ae,I5bc821fd into pi-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/114237888
  [RESTRICT AUTOMERGE] CTS test for Android Security b/111660010