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

Bug: 134405016
Change-Id: I3d65b8e6e1433ae0c4519485aa5152472a1ae823