Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I1491376b01562927e183fd31f4eb83f40d9200be
Change-Id: Ibc8e8d3fa14f8a0cf146d45c5c6099407ec834ae