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

Bug: 385190204
Merged-In: Iffd55b9463cfb5c058fbb794f373a9c616393574
Change-Id: I48460b235a0e39cfd0ed4d8d1941ec6a91f7a804