[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: 83b6c2e3 -s ours am: 046baa63 -s ours

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

Change-Id: I831372b9b7bd369943456aa2a2ea20352536ee0f