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

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

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