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

Change-Id: If4ec566cfd36b2f4ebb2aae465c39617074b6072