[automerger skipped] Merge "Show or hide call forwarding,additional settings according to carrier config."
am: 778ac2e622  -s ours

Change-Id: I1c14d07401821cd602634b2cc4ca43e4a5d0452d