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

Bug: 385190204
Merged-In: I00494e495244ca9281af2a1f10a717f915b3c1b7
Change-Id: Iac44f03e53a3a63410abcbf45cf90f97bdc403bf