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

Bug: 385190204
Merged-In: I331615c9de320d9e11c9c78235fc0de34d3c7179
Change-Id: Ib107eb5b156d8c207e69ae1eef2d3d6df31305a1