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

Bug: 385190204
Merged-In: I85132679579a43aa856eb00dac2ab46503bff76f
Change-Id: Ie8d1ef12ecf0fb80111ea79d8d7a33e72466c0be