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.
Network Location Provider requires user opt-in, so it should be disabled by default
and only enabled if the user agrees to the terms of service and privacy policy.
Use GPS as default location provider instead.
Signed-off-by: Mike Lockwood <lockwood@android.com>