Merge changes I115b6b98,Iff84c0df,Ice13f58e,I5302a9a2 into main am: 0381ebefc4 am: bee4b39116

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

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