[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours
am: 779d7d3a3d

Change-Id: Iff02a502acfab68f6e4d68c9fcafbf817901959d