[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 6cd5b9c0bf -s ours
am: 4277dd9104

Change-Id: Ic4d6468230f6416d73f9ccbb0e46658e16f69126
tree: 6900057e1e7e05f67d602dc946ebf7dd31ed78f6
  1. tests/