Merge changes Ib70a8498,I06f7450c into main am: d53c1a7b62 am: 974ed3575d

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

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