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

Change-Id: I95f246427f9118c2b3592b926f2f42e52a82d93d