Merge "Fix uninitialized value warnings." am: dd75c27f am: 7321f635 am: d011d2ca

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2365014



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