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

Bug: 134405016
Change-Id: Ic8d4d138b9efb149e3fe64519a80e1ed23fe50b4