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

Change-Id: I0a002c9e3147adfd1efbdd73e90b9289db05dfa8