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

Bug: 134405016
Change-Id: Ie8007e7ab0243b2aab2fc4d3cac09d8e44b06988