[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: af68f9cf90 -s ours
am: 40f1796888 -s ours
am skip reason: change_id Ie634ae39988b953a9256d2dcd277ff18514fb7f8 with SHA1 b07fe5145b is in history

Change-Id: I97cdd7c05058b8f5879fa675a4d43b0e964b4eee
tree: a31866a705968b9d851df9500d3899c6b73f464e
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS