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

Change-Id: Ia47757c0e66156aac9af0ef99a08ba5c790dcc3f