Merge changes I5b985fb4,Ic3acc857 into main am: 7aa9524ad2

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

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