Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123

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

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