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

Bug: 385190204
Merged-In: I479214cdc0f513dd73ee49c878d335900107e5fd
Change-Id: Ie6fe667a589f0311874c15323a44303f2445871d