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

Bug: 385190204
Merged-In: I5638ee20d4c2b1e8addfd2f5cf1d4b4ebc863f79
Change-Id: I80faff67b0924152e0ee7b4f80020e954d496200