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

Bug: 385190204
Merged-In: I5d787335c7c69ca26f4b659a53143a8f29bec930
Change-Id: I07567812b4c8f1dca72fd88086370615acf267f8