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

Bug: 134405016
Change-Id: I34349d90e8c9c48a8e2917113fdd8ac06ed26c26