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

Change-Id: Iccf06c59ed3b6ee8ff5231d06ca8eba72a52978b