Merge changes from topic "nxp_keymint_hal_upgrade" into main am: 3624156159

Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/3266333

Change-Id: I6a3745706a64a294499e95da93bbfda8a62d5448
Signed-off-by: Automerger Merge Worker <[email protected]>