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

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

Change-Id: Ia320b21948e1d3a81ffb10d7b975b720d107350e