Merge 25Q1 (ab/BP1A.250305.020) to AOSP main Bug: 385190204 Merged-In: If442080184a53dd88f892c452cbedb44cf18b181 Change-Id: I30a59c8e4a0dfcd478c0b6b49e6e076b9a21822e