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

Change-Id: I5d49e545c36cb96c278f80095f6e47dc7f42dde4