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

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

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