Merge "Fix potential NULL memory access" into main am: 42bf911a1b

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

Change-Id: I53894a4e52d0dd4258feca410fef72b5049d48c2
Signed-off-by: Automerger Merge Worker <[email protected]>