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

Change-Id: I4babe4870240e1d131523054018da606963b1dca