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

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