[automerger skipped] Merge "Merge 10952656" into aosp-main-future am:...

[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 4552a874 -s ours am: eb6fa44f -s ours

am skip reason: Merged-In I4aae4b6e740f163193a9fed1f2f8b3de702b8d45 with SHA-1 77129bc7 is already in history

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



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