[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: 9a788e15 -s ours am: e19e43b3 -s ours am: d52ca24e -s ours

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

Change-Id: I48230cdc3c85c1e82087bbf2eb149a93e521f134