[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 6354301c72 -s ours
am: 607edc055e

Change-Id: I24e7196673f485f10e2b74994502062a53269201
tree: 847bde34e76017e6a90cf2107c287761e502f7e0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS