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

Bug: 385190204
Merged-In: Icb80f237e9348d874974b18385f3b9d6d352fd84
Change-Id: Ia1374989586fb13fe0be7cfb27a7cd71b892d562