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

Change-Id: Ie5f11c8cbc9df64e6f429de62830a2c0ca76d469