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

Bug: 385190204
Merged-In: I1681a78bc0b6ffab2d21ee157b2fce823af741c8
Change-Id: I9f761174c75ac12c5c60b563dd57bec97f066b83