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

Bug: 385190204
Merged-In: I71af8d10e59b0c27a5b360aca48dd04f336f7d58
Change-Id: I89c8771d81468e25e11136b0e110a011313c08f2