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

Change-Id: I590935bd73e1689c650052866c0178c09b53a22c