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

Bug: 134405016
Change-Id: I2348391fb9969c2f4df3ee81cb1a332a7399fb4b