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

Bug: 385190204
Merged-In: I458544d603051159c12e18c8e49f7cda3581b46b
Change-Id: Iadd7d28e11a4d50ce71096701d283a806638b74d