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

Bug: 385190204
Merged-In: I65f89339979406df2a35b3e3430346c4d27df405
Change-Id: I3d6e5e3d30e17a1d0682f7f63e67f3ade65bd54b