Merge changes I95b466cc,I8bd90559,I8946a832 into oc-dev

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