Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 9ffe064d9c am: cf2e8f3f92

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

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