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

Change-Id: I88264163f2d4e27d806284dec917acd9f7075244