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

Bug: 385190204
Merged-In: Ibbba520f24e88f3dcbafd925aa8da319824377ad
Change-Id: Ib840c52538deb29ca92245d320d49405f45d2957