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

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