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

Bug: 134405016
Change-Id: I3eebac6b2bb3626b7d3cc548e065bf8b96355237