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

Bug: 134405016
Change-Id: I262c12f7d1194fc9a601d8e4254de9dbcce478ba