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

Bug: 385190204
Merged-In: I61f56aab5fba21c46a85f13c5a33decbb2d2e8ec
Change-Id: Ia1ca52660d1c3ad087257eaab981dbdeb0fcfa78