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

Bug: 385190204
Merged-In: I1dafd06061ce072093d0f0b3b621d3ffc4a3d8f9
Change-Id: Iba70db4e02d8d349bed8d5f240eaf874aab3e85f