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

Change-Id: I3267e64a00892e251b8dc4a181792ab056b54128