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

Bug: 385190204
Merged-In: I86a1fdbb9eb1ae13b8dbc04cd93b91f6c4c79f41
Change-Id: I671d4ef165162bc2876d965a2c7ad90735040284