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

Bug: 385190204
Merged-In: I2189ea7dbe6b44cf976f866705cd1b197761d0e6
Change-Id: I3411001d34dbeea09b6d14a4ee7f35d146627f6f