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

Change-Id: Ib84e2f5dcd8548761cf5f66f13e423b81cc1fe58