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