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

Bug: 134405016
Change-Id: I44a8c9bc26dbbb07706d3ccf6412c8bb2036ee9b