Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev

* changes:
  KeyMint: Add Root-of-Trust test cases
  KM 4: Add Root-of-Trust test cases