[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 8a2edf737c -s ours am: b9435341b5
am: 0b24d97ba6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieea5a3b1ceda132b6c4a0beeb2cd69eb03d38ffe