[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 03b0987917 -s ours
am: 5e056ed6a8 -s ours
am skip reason: change_id I31ac9f7d6cdd6a676e65513e7fb9422a7348fec3 with SHA1 2914f733ad is in history

Change-Id: Ifc15c735def0af5955828f792d3312812fd3221a
tree: 51ca55298479e4f60a064050e77d5da60931da3b
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.bp
  7. AndroidManifest.xml
  8. OWNERS