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

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

Change-Id: Iaf9015d5133f118e6764e20fadcd44f2a542dde5