[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 82ada650 -s ours

am skip reason: Merged-In Ibc80f09d54bec2c83814874d94a8f8eb22b5075f with SHA-1 edbf82ec is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31817403



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