[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 4b14a2aec5 -s ours am: ec96baea73
am: 5820327811

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