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

Bug: 385190204
Merged-In: If0b748ac74e054f089382c87d278df8e4a8111c5
Change-Id: I83ab60b566ba189c3568ce7d48b8f6eb7ad35f31