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

Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca