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

Bug: 385190204
Merged-In: Icaf5f09913292d86db2a3e0fc8457aad4cff740a
Change-Id: Ib3488fcca8d6594987f1e573e02fe63f650e9f9a