Merge "Fixing VTS tests after IKeyMint breakage" am: 8bfd260e3e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54b5febee377618a5a8a4bbe23d040e17a402813