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

Bug: 385190204
Merged-In: I4458e5ccddd29f67283a65590fd2fee1d7ea93f1
Change-Id: I89a2f644482650305c4c5bb9eff1b01d9dfc3fd0