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

Bug: 134405016
Change-Id: Ie79ed8445a7b952269e5411cf49c3cf63d6ec3e6