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

Bug: 134405016
Change-Id: I735c331609fd7cb7cd60cca18c9b3c17734d63d7