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

Bug: 385190204
Merged-In: I48624801d66a7196276e8e7aea887dcfc204bd50
Change-Id: Iebd433adf7b6431b1b6ecaed6bbdc59b107883e4