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

Bug: 385190204
Merged-In: I8587bd01d71a74024a3daad9b1a328471aec11d4
Change-Id: Id2b8509ede43cbaf4ae48d6e6bc4328c9184ddcb