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

Bug: 134405016
Change-Id: Idd1c63638ff9e67dd06dddb326e5042cf067baec