Merge changes Ib70a8498,I06f7450c into main am: d53c1a7b62

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

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