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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie646d8afe351ef5a8bcdb894f217f4d105708f5d