Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: Ic38e8bf93e0420e8ff4934232bc90952c09deb52
Change-Id: Iaff6817ea74e57c53364813b45c5c83b6489137f