[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: e92f785c7c -s ours am: bc1767d387 am: 84f007cd6e
am: db24d4d058 -s ours
am skip reason: subject contains skip directive

Change-Id: I5d3c2a382e9388d23bf4cc4daea74c6c86356f3f