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

Bug: 134405016
Change-Id: I8785a4f25a64218c7768ce4196c5c45ebeb9a2b4