[automerger skipped] Merge "MTP: Sanitize filename provided from MTP host"...

[automerger skipped] Merge "MTP: Sanitize filename provided from MTP host" into qt-qpr1-dev am: 2d3c39c7 -s ours am: 1261c29e -s ours am: 3486dffe -s ours am: 33912a42 -s ours am: b6f83527 -s ours am: 3da34964 -s ours

am skip reason: Change-Id I467e1e6a76d09951050f7f45e5a63419e540c572 with SHA-1 6111b2b9 is in history

Change-Id: If777a5e405ea4ee5bd2da67114b229e68ed9dadc