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

Bug: 385190204
Merged-In: Ic7e7229c95d0c47f1dee8ab50cf00d200eb97820
Change-Id: I28669764112054d5b49f0c5eead747b94c351716