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

Change-Id: Icdf15c085d3983f422d483fa22c199adb3840ae8