Merge changes I1eba62ea,I4e83cbf6 into rvc-dev

* changes:
  CTS test for Android Security b/120499324
  CTS test for Android Security b/151644303