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

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

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