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

Bug: 385190204
Merged-In: I66f4c83c597d58648d56b95f55f3091a1bb550be
Change-Id: I1d7ba09123a03e9657b13ec6374d76e1933b8130