DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

Bug: 134405016
Change-Id: I0bf3ed0d9490a940a84bc0710d860f3c1942441f