Merge "Remove usages of SettingsLibDefaults from telephony"