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

Bug: 385190204
Merged-In: I686066d2cb99b7ab6cf8b05e3beebb51e0900d36
Change-Id: I0f213881178cb60c1e4ccab3eb48292cc9b39e80