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

Change-Id: I0176c93c9802c517b10bca3cffabe244720f48a1