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

Bug: 385190204
Merged-In: I330e133c886d5fc2e8a0f7906c093e0706961650
Change-Id: I02eb0e30898faf8e41cdd0528d654d1bf119ea74