[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4151a92899 -s ours
am: 847cb61b40 -s ours
am skip reason: change_id Id8a24bbde84912e570e5f13627bde18fbeaecf38 with SHA1 31222e40c9 is in history

Change-Id: I28861e641c326ab253969c3500be4721dbd2e22d
tree: d073c5f6f285c85dd7100ae92ad035c0d10160c5
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS