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

Bug: 134405016
Change-Id: Ib95ce2d2377092e6ff75151eacb98e516a4d06ff