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

Change-Id: I401833c4cb460973f0cda3a348efc091ae07a8a8