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

Bug: 385190204
Merged-In: I8628506120a8646d86281b29c6810129ff8929bc
Change-Id: I44ad2fae3c96bdaf27ab548a063ffb0966d33ed7