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

Bug: 134405016
Change-Id: I8f1653c7e8f3f6f74acc3eca1d490e4575ad9e61