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

Bug: 385190204
Merged-In: I73a3e86e02d18e02140e199b7cc99c918055f35d
Change-Id: Ib63f1503d75fa2ca724da447209f8841dfdc27d2