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

Change-Id: Id8fd2a539d982c3b8b015ac969f38f56858e56df