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

Bug: 134405016
Change-Id: I5d15357e83a88d25ce7183f6b7ea67a5fb1c88c9