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

Change-Id: I6b14fa172497cebf4e6ec7e45e0bb9efe5a4cabe