Revert "TeleService: Settings clean up"

This reverts commit 291768a621ffd426b08abd17d2e83ab75240edf3.
TeleService: Settings clean up

Original change: http://review.cyanogenmod.org/#/c/74655/
Original author: cretin45 <cretin45@gmail.com>

Change-Id: I1788deac5186255ae7d05a2d54923d6eae943cae
Fix build Error