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

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

Change-Id: Ibee56f82e9462f3197d1fd68ce1981dbe62494f4