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

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

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