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

Change-Id: I9223fe93c2d117eaaed290093f0d09c14b6ddacd