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

Bug: 134405016
Change-Id: I3ae2468c71a8ebd4ee7fc6f406bed1cba132fe05