[automerger skipped] Merge "Fixing passing pointer to uninitialized object." am: b0d66a87f8 am: 5674a3fb22 -s ours am: c7e80b198a -s ours

am skip reason: Merged-In Ic513dc9fc2146ef0c131f04088f1d25c9963bc2a with SHA-1 f9626909bc is already in history

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

Change-Id: I11a84f6f13a90a12897f300bff5983f4bb70a554