[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 42e8b5d483 -s ours
am: d6d8e9871b

Change-Id: I407f481a65dad4cc6e75c3f3c938544fe62bf7ac