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

Bug: 385190204
Merged-In: I2e3eac0b93594875e94aa8da986c36199254da57
Change-Id: I8640d8e49f8ac0ab479bc665e7ebd0cc5d1fe69b