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

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

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