Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I35a0a1d6394fa18a2da26d663fbec95ca3b0355f
Change-Id: If870361d41319ac69ab008733f53cd8a3e16fd8d
tree: 916e37d53c684e171aad899595fe03d9ac443da5
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg