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

Change-Id: I1a564d8b62514f2f98b6d091dca95bd2ae97486a