Merge "Merge Android10 QPR1 into AOSP master" am: 9d48201be3
am: cae4738088

Change-Id: I5b42791b7ca6b7e75267d302dc4a2ab70f7967de
tree: 847bde34e76017e6a90cf2107c287761e502f7e0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS