galaxys2-common: More DeviceSettings changes

-More renaming
-Now requires SamsungServiceMode

Based on: https://gerrit.omnirom.org/#/c/3686/