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

Bug: 134405016
Change-Id: I0d1fc0e5f5f7fbd56d9f1032b806bfe82a5dd08b