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

Change-Id: I2d04470a049b0d00cc63f8dc6d0e80eea7ad9844