Merge Android10 QPR1 into AOSP master am: 85003cbf47
am: 15c0e7175a

Change-Id: Ib00512599e01416a1158948939f7b2fde583494a
tree: 8f79e67451ff835a0bcb41d6db826c29b996cf75
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/