[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c87 -s ours am: d5458444 am: c7a33bf6 am: cf52221b -s ours am skip reason: subject contains skip directive Change-Id: Idcaa2bcba7fd94b8e8e29dc140e1a89b8c158a34