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

Change-Id: I18ce0c7d634ccd025b9d8ae0dc1e7dbc0f9f9d00