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

Bug: 134405016
Change-Id: Id34ffd4a1b9f91e521a65b1fc225c5b9666c501c