Merge changes I6248bd4f,I9f5c8900,I2aa433ce,Id828894a,Ib26d8d30 into oc-dev

* changes:
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/68300072
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/66969193
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/37761553
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/36576151
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/65540999