[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e
am: d4b3f65d -s ours
am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6 is in history
Change-Id: Ia51fc2606a1ae6e97247f07444e4a5cd7a4629f2