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

Bug: 385190204
Merged-In: Ifbe9af2864e8defb1851b22cd26ef67613678801
Change-Id: I36957a7978817cea5f111d3c95e1cf15d94a117d