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

Bug: 385190204
Merged-In: Ia3c499666394242ddeaa4b3d11e6c903ca9d2caa
Change-Id: I1596b0ec57b32b9c6728dc050efcd9b5dce5788d