[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 681b0cf972 -s ours
am: 61f9d97355

Change-Id: I06d6f67ed46cee40571549e693284405d70e0f35