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

Change-Id: I0d40d6fa939814aca93258f7ff91fa55d87bbba0