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

Bug: 385190204
Merged-In: I9035544b54fa974f27b4e7c5d2c81f79e6b44090
Change-Id: I53b451fc2a32909e6872ce247ea54b04fcc940f8