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

Bug: 385190204
Merged-In: Ia1f56a821b6f014ef7681f939a66ec525323a48b
Change-Id: I9fd49281cbf4ff70b3846d1ecc25bf9134e3dbda