[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b2b97cdd41 -s ours
am: 97dbf86980 -s ours
am skip reason: change_id I9e7e8d1457be3542cc00b9f9ce5a8a1500fb36c1 with SHA1 9dc8c8ebea is in history

Change-Id: Ibf76b680b2e6fe847662fb162eae8c614203b95f
tree: 6b3fe9c4233d07aebb04f622d9b5b6341386bb1f
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proto/
  5. res/
  6. src/