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

Bug: 134405016
Change-Id: I1e227d86bbbbe4aebf4c1681773316f0ffc05f5f