Merge "callforwarding: Fix duplicated error popup" am: b22401b950

Change-Id: Ie443d0b46e50bb706461302c8798375d462e623c