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

Bug: 134405016
Change-Id: I0f15d1105c9bd12d9fd21823d9f15c7f60edac68