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

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

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