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

Change-Id: I77b2daaf56383c12d3e9ccadcf6bb18962e5a037