Merge changes I22f22bf8,I7a9dd679,I3f13b811 into oc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/63522430
  [RESTRICT AUTOMERGE] CTS test for Android Security b/36104177
  [RESTRICT AUTOMERGE] CTS test for Android Security b/68159767