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

Bug: 385190204
Merged-In: Ib562fdc672f09e92c646583840c324ad50e2fa39
Change-Id: Ie21212b27d78e41c9dacbfab510925d29653cfeb