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

Bug: 385190204
Merged-In: I8aed77fdae73428a32d746bfd5e1527aa8aca62c
Change-Id: I89358c08431767743d23e49e1db0c3f9dc80bf84