Merge "Modify "Call Barring" UI to remove pref options per carrier"
am: 0aa764b551

Change-Id: I06b8ac0bf6164d04336a0f3b8e5d3181ad7ee218