Merge changes from topic "am-d8fea4fdc745480eafaff93d2422f2b9" into main am: ae983560 -s ours

am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef is already in history

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



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