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

Bug: 385190204
Merged-In: Id1563f6b49e3f7eaa0fa8965887d2f8bd07d0eb4
Change-Id: I8542956b74a433c299d767b4d6ff1642075906d8