Merge changes I68fa51f8,Ia16aa041,Iba57f5cf into main am: 4c5b2303b9 am: 296446e368

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

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