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

Bug: 385190204
Merged-In: I47038580b42eebc4d420ba35d2bb6bedc6d660e3
Change-Id: Ic922b8088ee6990eaa48309755befafe4ceab036