[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 8b76f6692c -s ours
am: 4e18329940

Change-Id: I7b19253783135ec1683dd32771a9d2e277aad82d