Merge "Change package to component for Setting's default call redirection service" am: f67ece13ad
am: a6bf55bcc6

Change-Id: Ia1d7455d2663c2942dfb298e9222e6c2b8d98529