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

Bug: 134405016
Change-Id: I973d953e4c10365e594ddd68516bdc4d7dd0de1c