[automerger skipped] Modify "Call Barring" UI to remove pref options per carrier
am: e859c2198b  -s ours

Change-Id: I1c3078244355972d1a2c469ed667e94fddb23bd8