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

Bug: 385190204
Merged-In: Ic54ff222b2aac7f010c94ec6b3be7cb4a5f65e23
Change-Id: I976b3c4e1e63e41a3cbc5777c4598ca7a463e362