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

Change-Id: Ie4586a06c6efab7917dd7be028698a3dfb2fe2ec