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

Change-Id: Ie4a53f7b938efe41f544727532b11a2c15f0e898