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

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

am skip reason: Merged-In Icf400533b0ded98b9338f2d782d95d90c7efbff4 with SHA-1 96ad2036 is already in history

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

Change-Id: Ic3e2845041ca420ef9b9c0036a5aeb952e5b827e