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

Bug: 385190204
Merged-In: I7c8818478477497ffdda60ed5993d4f801f02d9f
Change-Id: Ib00ca7e6cf4b72c68b19857d869d06b868aabf6c