[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0e6 -s ours am: d02c844385
am: 4a914a0c31

Change-Id: I278f8521e9e556e64cf2fc14d4c705d92d6262b5
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags