Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally

reintroduced in an errant and clumsy git merge operation.

Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.