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

Bug: 385190204
Merged-In: I7129a4cb50eba3a26b6a968c95cac96a95b1c810
Change-Id: I577b343c55e5be8930d4eaf554ddeb091b29e90f