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

Bug: 385190204
Merged-In: Ibc6513ba88f2de0a39661fb5d5219be2bfef7d58
Change-Id: If8ae7daed5314bac501f6b14bc14dfa3ea9ffd60