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

Bug: 385190204
Merged-In: I1b8b322f3d42a478b8ca51ffabcbef40546e9855
Change-Id: Ibcf9439161dd9b129fe45dbf27f2afdf9eb5a234