[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: bf2977e1 -s ours

am skip reason: Merged-In Ie1eda02d286fa7d5a9419952704234f729f3efbd with SHA-1 7b3bdc42 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/30950389



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