Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9 am:...

Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9 am: 22e44674 am: 0ce656e1 am: fdde224b am: ff9bd9d9

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



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