Revert "another merge derp"

This reverts commit 05693e7dcedf0433f0151f0dc9db03f02b93f94c.
Revert "fix merge derp"

This reverts commit d31fdfcf896f246db110eb81f249cb5289c9ed73.
Revert "Fix Samsung STK code for msim"

This reverts commit 8b47d247f1987dc7834c156313bd2aba05c81504.
Revert "Samsung STK: Fix SMS-based STK"

This reverts commit 0cc73dbe34cc0738ae3ab22f104af6174d642193.
Revert "Samsung STK: Add USSD support"

This reverts commit 4a72a191a75752a23639a15c8cfa2efcbc364b8e.
Revert "Add Samsung STK support (telephony part)"

This reverts commit 524d2ae8672e696ae820132d6e4acc1fddd4cc89.