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

Bug: 385190204
Merged-In: I988c95fbcfd51da2466ee28b0e9093b18c854ce5
Change-Id: I0986272050a1a1d383a2bdeac5012febe95fb0c4