Merge "Use fallible allocation in UNIQUE_ID generation" am: ef7e220ebd am: ceed0f5660

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2505895

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