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

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

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