[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: a06dc09418 -s ours
am: 8a6692452b

Change-Id: I5a5edb135e7c5a674255272ee3d5dea3e8c02cb6