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

Bug: 385190204
Merged-In: I6b4fedaa85d03b4025e49091795d3a90a8d536f1
Change-Id: I00fcb40ca11544391e974ffd08c113fd2e45b9e9