Merge changes If824cb70,I025d9d68,Ic5a57a89,If5d63f39,I1adb1906 into main am: f3e994b439

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

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