Merge "Fix uninitialized var compiler warnings" into main am: d1e04d21 am:...

Merge "Fix uninitialized var compiler warnings" into main am: d1e04d21 am: 5dd9d646 am: 80c8c7f4

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



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