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

Bug: 134405016
Change-Id: I8d6e43e6bb6bd8048a3ff9754c818cab40f49f2a