[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: f4dcbaeb43 -s ours am: 1c7a074323 -s ours
am: 38827a39cc -s ours
am skip reason: change_id If08aa2717e8ed0a7454a495434e11251f1fb877d with SHA1 8daa88c204 is in history

Change-Id: Ibf6cec1ade21178e41917f6a93d1bfea9942beef
tree: 25262c115ee53a0576886637b8acbe386033a1c6
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS