Merge changes I4f8d3641,I07ccc032 into rvc-dev

* changes:
  Revert "CTS test for Android Security b/159145361" part 2
  Revert "CTS test for Android Security b/159145361"