Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Id306d29c942fc2155709c1bf6faaf6ebb4005626
tree: 0a70f10cc2199aeb833513797abf8ed2af378847
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/