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

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

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