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

Bug: 385190204
Merged-In: Ib6703720da3209935ea14ef709f89a0ac938bd65
Change-Id: Ib8f4a8cf9264d33ffbfcce9032521a1a80c5d7ce