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

Change-Id: Ib5e1f4343c97941895f554bd8193852519ddf494