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

Change-Id: I42a50e8498fdb925bb9765fd2d5cad0d0644632d