[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 26f1b51bfb -s ours
am: 4c704ae3ac

Change-Id: I972041ee581d17567be212e115e34c3c3a0508a6