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

Change-Id: Ib68c7bf43fc673c9071c29927cd6e98e86e84005