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

Change-Id: I0b8c0bb303f3931f3a021f88f785eccd24538a56