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

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

Change-Id: I0d714825903e326c96281abb303e82e4a12d901d