Merge changes I4071f072,I535d72f3 into rvc-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android security b/143464314
  [RESTRICT AUTOMERGE] CTS test for Android security b/166268541