[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b7fab0094c -s ours
am: f920179eaa -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I948c2d499e46121dfce5a6ed1bad05a285ddce62
tree: 46b2bce636a4cb7fb5747847fed40eefccba5169
  1. tests/