Merge changes Iba59fdc3,I812fccf2 into main am: 8d63f0080a am: f2500732b9

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

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