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

Bug: 385190204
Merged-In: If2f2aae1131535b8d7f7e9e3cc793daf38987e13
Change-Id: Id7882eadb6b61841e236375d79c839dc562c4ae9