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

Bug: 134405016
Change-Id: I7b2848c7eff8a193adc998d4d2dfea0ec05b7b73