Merge changes I4bc34ee8,Ia29ad5d0,I200e839d into oc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/134420911
  [RESTRICT AUTOMERGE] CTS test for Android Security b/142602711
  [RESTRICT AUTOMERGE] CTS test for Android Security b/134578122