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

Change-Id: Id4294fb1aa2822fa410fa2d57f2fa6dfe315000d