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

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

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