[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: b90510690c -s ours am: 0fcd2d5372
am: f89a6e2035

Change-Id: I0ac83e4e6bb601c790c6903bf752f43e4e508817
tree: 5663e02f942ac1f5f2d9b74920202675aa6506ed
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties