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

Change-Id: I33b0b697a9a967a1397ceefc225c5cf28f7931a4