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

Bug: 385190204
Merged-In: I0607ae406e3473c0ffc4448f65da7afce22888fb
Change-Id: I4dc8ca74fea50318376f455669754332fa9b9afe