[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

am: 923156a720 -s ours
am skip reason: change_id I157ff596deb419a57eca32a9b8d954d76294f627 with SHA1 ecb37ee845 is in history

Change-Id: I299877eaa8613b5c246f70fa73d0e9094d911799
This commit is contained in:
Xin Li authored and android-build-merger committed 2019-09-11 14:08:18 -07:00
commit 942aeb2c4c

Diff Content Not Available