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

Bug: 385190204
Merged-In: I34ec42becbbbc4b1e02013c571ece3e49e44bf3f
Change-Id: I081b209ebcbb595b1c763b1237a4ae23b00a16f2
tree: db140f35199c7df9bf14f066f487d5d6ddcf3171
  1. apex/
  2. flags/