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

Change-Id: I412f63b339a8b6cc0781fd18c07b0c90ecd035ff
tree: f8229f09a6dcfa807dc05fd52e4fbd1951d1dabb
  1. tests/