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

Bug: 134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6