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

Bug: 385190204
Merged-In: Ic08f46624d2728b85d35fa3b0433c9f716c1c00e
Change-Id: I7c08ac1afcbd56dc7f47588963eefbc797257d7a