Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: dd5b2fc509 am: c1737d8cf8

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3514252

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