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

Bug: 134405016
Change-Id: Ic686a68bc30a64c2533e76c57cabed9a3eba2dfa