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

Bug: 385190204
Merged-In: I1be59d807a8a3c2e8a9b6a8179784a8eb58fef83
Change-Id: Id65310f3f7b134c5c666c92ecae6e33726a7eeef