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

Bug: 385190204
Merged-In: I05847d459b0b16e686cf0ff6f2bc1a217d15e45e
Change-Id: Ic25857ec6c3c481d0b3433479cbf6ab413e4a9e5