[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 68359af489 -s ours am: 4957268962 am: de7c26279d
am: cbacadadfe -s ours
am skip reason: subject contains skip directive

Change-Id: I8df44f10a8ca89bce04d034573506630f9fdde8d