Catch more allocation failure cases am: 513e6158d0 am: deb9281da9

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

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