Merge changes I82056aae,I3977680d into oc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/37761553
  [RESTRICT AUTOMERGE] CTS test for Android Security b/24346430