Revert "Completely remove DeviceSettings" Stupid CM idea... rip it out when the replacement doesn't support everything grr..

This reverts commit 25e2ab9c8bd3488d5829387ee96d9978df58e9b6.
Temp hax

Change-Id: I67464e420ad44f5d3c393fb995c853b952cc0a5e