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

Bug: 385190204
Merged-In: If22ba92978ec7e408a4c494421cec1ac2df4e03c
Change-Id: Ie9ee25cc7769222deba27ed993933d11cabf86b5