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

Bug: 385190204
Merged-In: I49f9039d88ca8c4af76707cc4345052cba13b562
Change-Id: Ic455c8f2fed153e607244bbb8caed1aca0062b52