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

Bug: 134405016
Change-Id: Iac97bf47670492e8082d3e1b989d500d6f50c4a1