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

Bug: 134405016
Change-Id: I0f9ac646b953d8831f47f28b2f20df90d9b028d9