Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93

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

Change-Id: Iab23fbab7c1c37e7e50abe426d6cba02c163a35c