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

Bug: 134405016
Change-Id: Ieed3a8162dfa04d26cb39eeb7e46c1c9e65e40e0