Revert "galaxys2: remove DeviceSettings"

This reverts commit 99d12c6a903a3199ba4956add53b82837d90ca9c.

Change-Id: I3d625a55ef288a9ea786431156db2c8a8c3c13e4