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

Bug: 385190204
Merged-In: I5860f51508f520fb64f459f215a1e6cf712c0d4b
Change-Id: Ie84695f27a2a599c6a64fd28ed3a455ef61191bb