[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: f6b4b11432 -s ours
am: 42550b01a4 -s ours
am skip reason: change_id I245080494d61372a3d972fc87e1ccc5ad8e8ed5a with SHA1 8a66b667d2 is in history

Change-Id: Iea86e145b7d15376b820a3ae7cdebfa1970053c1
tree: 74663c9b873bf045eeca9bef759d35345e1cd383
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS