DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master Bug: 134405016 Change-Id: Ia823681c5104d6b1986330db6205eebb5af3f307