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

Bug: 134405016
Change-Id: Iabbd61e4e4c29fc2db3ed87808b105d3470d79ab