[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours am: 8e4484271a
am: 3ad76b492c -s ours
am skip reason: subject contains skip directive

Change-Id: I43b266924593ea4c0ab47cba4645a805f9fb558e
tree: b8a9d9de8145726a17b5fa41a31c6be327d52347
  1. tests/