Merge changes I5e19880b,Ibaed7364

* changes:
  KeyMaster VTS: improve attestation tests
  KeyMint VTS: improve attestation tests