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

Bug: 385190204
Merged-In: Ib29382d17cc4fd6b479c68674f2efaa1ac626f19
Change-Id: I3f708d122f3f899af5828e67a0287fe8a28bef33