[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6b0fcb78c7 -s ours
am: a33eca5cb0

Change-Id: I09869303fd29079aadc1d147d06c6d3b8b22c095