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

Bug: 385190204
Merged-In: I858dd42ac8dffb6b4fd9926f713a82a65d50a67c
Change-Id: Icc9d05fda8ab4d57ae8370b2adcf2e0d1f97d6a3