[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ae8562a657 -s ours
am: 3343a8f2e3 -s ours
am skip reason: change_id I25b8d7281e3e6449286370f04ed3467f90bf9135 with SHA1 515697c293 is in history

Change-Id: I322087b1fce250c69f657a081ebfa7efb8f556dd
tree: 499e089d193efa50f8b4c11d7cdd723c26c680a8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg