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

Bug: 385190204
Merged-In: I296ca42a570d7c3cd35a8fcbad49f1dd23e15d9f
Change-Id: I412325b6b77e09af2bdd4b17a1ff57f93ea7bd64