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

Bug: 134405016
Change-Id: I77e0c2ec5e8a4e9cdc21635d8ccd9d2acbf71e3f