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

Bug: 385190204
Merged-In: I4efc47e0682d0c5622c968413266b94d3b1f0943
Change-Id: Ib35345ca131677a9ff391a883b5a6b3388984279