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

Bug: 134405016
Change-Id: I0d0d6bee866349030f2bc6b885d7ffd5e2901454