Merge "KeyMint: coalesce device ID failure code" into main am: 25876eb8d1 am: 02131b5385

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

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