[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 515697c293 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia52a83a90f5d03e8ccc2fb93d8a6c0ec076a7a40
tree: 499e089d193efa50f8b4c11d7cdd723c26c680a8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg