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

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

Change-Id: Ic7c0a201d7a997c9868ef8e36b62ee62c6bdba40