Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9fc am: 22e446746e am: 0ce656e198

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

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