Merge changes Iba59fdc3,I812fccf2 into main am: 8d63f0080a

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

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