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: I47a2235c25ce610f9edaceaeb7773013897ae7cc