[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 79c2486ee4 -s ours
am skip reason: change_id Ibe4f862f95d9dc94c69529a1e8179beff08a0c2b with SHA1 478eb8d9a1 is in history

Change-Id: Idfaa7c004f350945b86b2707939463aeeb212cfe
tree: c097a08b637cc51174e6842078f1beb7b6815257
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS