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

Bug: 385190204
Merged-In: I1771fbbdcdf06fc8faf8f12cd6a090c659d75635
Change-Id: I40c26ef1fe0d52a249b99fbb3d914a6139da047e