Merge "KeyMint: allow extra error code" into main am: ae8c281824 am: 338d8e99e7 am: b5de35ceeb

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

Change-Id: I64dfc458a06c567f27c6b15f8ad91560de811b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>