[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to...

[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future" into aosp-main-future am: a45a199b -s ours

am skip reason: Merged-In I5d410f05b061a41e089fa652e5565224a3488baf with SHA-1 5ada3c56 is already in history

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



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