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

Bug: 134405016
Change-Id: I09133c27ae2f161baae2ff83b943e2fec5fd4ea0