Merge cherrypicks of ['googleplex-android-review.googlesource.com/33707073'] into 25Q2-release.

Change-Id: I505d4d5756f31a94b6c5a4c43b842d3e01ba3399
tree: b74ba149f0ca8397584c211c40d50b801d3806f9
  1. apex/
  2. app/
  3. system-server/
  4. util/
  5. OWNERS
  6. PREUPLOAD.cfg