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

Change-Id: Ied4984d4c71c5fae72042adbe8e401517da445e5