Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: Ic1dc73d27beac39926f20f6ad34982693475884d
Change-Id: Id1d90f9e048714dd310850a1de5bb426e63ccad3