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

Bug: 134405016
Change-Id: I63f4c074378abcaba2f9dc9a4f3d7469c6bd0d37