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

Bug: 134405016
Change-Id: I0da8d4c4f7196280bb894e07ecd69e9c33031cbd