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

Bug: 134405016
Change-Id: Ic1ad7fec8b18892f04d1d5acf811d223a2a38665