[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
am: 254d711508 -s ours
am skip reason: subject contains skip directive

Change-Id: I2340be7fbe68f2b9152fafe5e6929b73055d6fc6