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

Bug: 385190204
Merged-In: If6519a9cd5d91a1eb91f61e4c3f79829664e770c
Change-Id: I660732170a8c9e751abe239bf0c747ad3a15e6e3