Revert "cherry-picks: UMS/MTP switch"

is in upstream now

This reverts commit 363b5d0b8fe15423f5a92c1ef64dda080ef6639c.