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

Bug: 385190204
Merged-In: I85103e0a3146aff5b81e5e59260cb9ef7f29bbe6
Change-Id: I9aecda8765ab58161167c48f8bda59e846503e6a