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

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

Change-Id: I472e65866c579be26baf62a089dbf1cd974ba673