[automerger skipped] Merge "KeyMint VTS: test getKeyCharacteristics()" into...

[automerger skipped] Merge "KeyMint VTS: test getKeyCharacteristics()" into sc-dev am: 339b9017 am: c991e9fe -s ours

am skip reason: Merged-In Icf400533b0ded98b9338f2d782d95d90c7efbff4 with SHA-1 300b555b is already in history

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

Change-Id: I4a1f04cff75294c0f49d5df8952e9cf77c92d899