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

Bug: 134405016
Change-Id: I284a8e309f3a2ada92ffae93c26b0ef00ed72dac