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