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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie35e0cebb63f9e758e3a24c994da7b8bb2fe13ba