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

Bug: 134405016
Change-Id: I63b5e97a7f3a893ccf9bfe15694d3f3f459bf8f5