[automerger skipped] Merge "Modify "Call Barring" UI to remove pref options per carrier" into pi-dev am: 50ac0ff64b  -s ours
am: 3fccc34d60  -s ours

Change-Id: Ib5e9ab7cb11cbfa1de1295fa9ed11976e571bd86