[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0e6 -s ours am: d02c844385 am: 4a914a0c31
am: b20db5b76e -s ours
am skip reason: subject contains skip directive

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