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

Change-Id: Ic799f4b0e42aad5f9446478a1954555b9afbc689