Merge "Fix uninitialized value warnings." am: 58235e680a am: bb2f99a2c3 am: ffb454f2c9

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2364069

Change-Id: I0151651d82c538a26e6935ecd1d6dd6e2b654ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>