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

Bug: 134405016
Change-Id: I4b6050e8762d256cfef75a8b6bad8bcdbcf9d151