Merge "Show or hide call forwarding,additional settings according to carrier config." into pi-dev am: 35d17261e5
am: 81b2421f8d

Change-Id: I0201c8d40845bfd56f1cfe3bfecc6dec20251ce3