Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: I2c43b6b15162295c8f74bc1a2f2142869803a16e
Change-Id: I97423b6719b2cd9102b30dad6bdd5de4f21c3cd0
tree: 6d0dff4de2b42d24e095d99eea3d3f024415bcfd
  1. apex/
  2. flags/