Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 1b82105349

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

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