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

Bug: 134405016
Change-Id: I60cedad18edc2b1e57d75a2a861f20c12bcfd748