[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3238bb8068
am: 9c066c33d8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice0050719160f9a644166050f76594d8a2820a08
tree: e046b1a903afca84c51bb1f02c045ee82d195e49
  1. tests/