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

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

Change-Id: I9ab8ff2be49db4e2946e74e6dfd7c196bd4687dd