[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 639116d20f -s ours
am skip reason: change_id I0f9ac646b953d8831f47f28b2f20df90d9b028d9 with SHA1 209f1362de is in history

Change-Id: I5ab6efdd2f3b814835383d026d1ebade1bdb0075
tree: 28458a3aa3ae27b497830d58c31a2c82e9e68cca
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml