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

Bug: 385190204
Merged-In: Iae33f33682ff2d90a60fc8204de31398c2c2262c
Change-Id: I9eec260427014c69282521c052c7f95c7282e386