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

Bug: 134405016
Change-Id: I5e7e97fa0c238ae5eee8530cdbd1be72c9f83454