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

Bug: 385190204
Merged-In: I5d240b23f01ceef0336d980152616e6a392cd017
Change-Id: I4d4c03667eaefea59b0ba6a221d93998ffa24c7c