Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123 am: 5dd9d64608 am: 80c8c7f404 am: 539d0b92e4 am: caf68ba391

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

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