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

Change-Id: I0cb71426c37d74f5ec1fb046b4d6ec1588a2c8c9