Merge changes Ia776548f,I6948de2f,I789a1d45,I5e56b65f into oc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS in infeasible for bugs 62133227, 24346430 and 35430570.
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/17769851
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/32096780
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/34749571