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

Bug: 134405016
Change-Id: If4b69a20ab2bfc1d12317f62dfb7ac5f474eb039