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

Bug: 385190204
Merged-In: Ibf2483fab4d7974b81066cdc8e85e44f9952adeb
Change-Id: I6760b9740b60ff66525a0c2eb97b4c79313ffae8