Merge "Fixing passing pointer to uninitialized object." into sc-dev am: e8a20d0420 am: 384a20d12f

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

Change-Id: I672253c8ecdf990dff78d053ee5f542500fcae55