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

Change-Id: Id401da0a8e3079cd57c0672cdbc43fd7fa40d298