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

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

Change-Id: Ie62222e4211df92fa33e10cb6310316577f87e5e