Merge "Fixing passing pointer to uninitialized object." am: b0d66a87f8

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

Change-Id: Iac78fca447f2aaea958531e2dca95526bbb7cb97