Merge "KeyMint: allow extra error code" into main am: ae8c2818 am:...

Merge "KeyMint: allow extra error code" into main am: ae8c2818 am: 338d8e99 am: b5de35ce am: ec188404

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>