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

Change-Id: I83202139e6dc0eaadaa7f51a8cec5fa080faefca