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

Change-Id: Iea5059ec534c1c00e8beb2667316e5b438a959b7