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

Change-Id: Id4d38605cd59ee4dfcc9d69516e41c5ce8e7ef32