Merge "Disable Call Forwarding option "When Unreachable" if configured"
am: 0ef081b5b9

Change-Id: Ibb5e2260bc50527ee1b0cc53ed7e66a296973dc6