Merge changes Ib7509508,I7e256e8d into main am: 310e7ae496 am: 72ba5c12be am: 49c057599e

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

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