Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6b0fcb78c7 -s ours am: a33eca5cb0 am: 47226fe7d7 -s ours am skip reason: subject contains skip directive"