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

Bug: 134405016
Change-Id: Id6cf11695f0e7ab7ce821376ce8281f23dc37e34