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

Bug: 385190204
Merged-In: Ica9d24d0e80bc4d3a73fbb0b718e3dc7f046d379
Change-Id: I95ab239afc3e166e30069119ac295cb4cfcaa06e