Catch more allocation failure cases am: 513e6158d0 am: 6395bd0d88

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

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