[automerger skipped] Merge "KeyMint: improve HAL spec and tests" into sc-dev...

[automerger skipped] Merge "KeyMint: improve HAL spec and tests" into sc-dev am: bad3aeba -s ours am: 59cda5e5 -s ours am: 9e92267f -s ours

am skip reason: Merged-In I70a342084a29144aef1ed0ff80fec02cc06ffbc0 with SHA-1 216d9929 is already in history

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

Change-Id: I68462cc118f3541a84e3f7ff9c209139e9e9e56d