Merge changes Ie74b9c27,If2224475 into main am: b45c8ad0

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



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