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

Bug: 385190204
Merged-In: Ie1eda02d286fa7d5a9419952704234f729f3efbd
Change-Id: I6396e771956cb99f2963470287c34d84caf5e105