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

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

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