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

Bug: 385190204
Merged-In: Ia30884e4c9cfca15e42f90c7925b439921df62bf
Change-Id: I8740e1c02928fba0e224b556007c14eb9cbb631a