Merge 25Q1 (ab/BP1A.250305.020) to AOSP main

Bug: 385190204
Merged-In: I1be7be911022a700e69a2ea7bff1fb06ff567341
Change-Id: Id3359430d552fa79e50f43c763cf623dc0ca89df