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

Bug: 134405016
Change-Id: I06f4c36ab0b7393c671d716d238ed8fe185d50ff