[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0d37ce6efd
am: 66e5104f9f -s ours
am skip reason: subject contains skip directive

Change-Id: I611179f7ba1797de5b0bd911aa5c737c749d720b