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

Bug: 385190204
Merged-In: I0fcdf0c0935051afa8d85fad8a6af6c4054ba8f8
Change-Id: Ifeb5e3cbf3aeac4136bb498af585b2e077e6a683