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

Bug: 385190204
Merged-In: Ied336df1aaf5daa7bfa711e02cc85b3d5af32ba0
Change-Id: I4d0d13ed10ec808e5be8d7eea83fb49c595af009