Merge "Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0172a23b1a -s ours am: f56a529627" into qt-r1-dev-plus-aosp am: 885e720438 -s ours am skip reason: subject contains skip directive"