[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 9e40dec411
am: beca8bd5fa -s ours
am skip reason: subject contains skip directive

Change-Id: I90e26a0f90abb70b2587827d9e3bb49106497137