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

Bug: 385190204
Merged-In: I16c79c711603579f0e1295dcf07d25506771714b
Change-Id: Id0f109945d7524d71210d4887d3ab97a9074219e