Merge "[Settings] Remove dependency of TelephonyIntents"