Merge "Clean up Call redirection setting"
am: 9d6ac63e5e

Change-Id: I5448d6a350032dca4a69332ae9a49338c3f4c1b8