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

Bug: 134405016
Change-Id: I5cc56bc3eb5b18a87e96749bb4b237d865443ef7