Merge changes I2581fd7c,I1ed57e6d into main am: 64062f8f4a am: 112b3505e9

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

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