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

Change-Id: I05dccc0212091f220cdaa41c2ad604217823b914