Merge "Revert "Revert "[Settings] Remove dependency of TelephonyIntents"""