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

[automerger skipped] Merge "KeyMint VTS: test getKeyCharacteristics()" into sc-dev am: 339b9017 am: 8bd88f4d -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: Ia64de87d77f8313bfb02bc3bbaa570de1c215b32