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

Change-Id: I3b03d66bb4b3f95a63996c7897775c3cf929b161