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

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

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