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

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

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