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

Bug: 385190204
Merged-In: Ic9dad1f70197bdfb2921cf5c89b1ea1341f23c2b
Change-Id: I5f5302ad1d124ea76c7506d1fbf183c2b3c8d920