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

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

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