Merge "Add carrier config option to show call barring UI in CallSettings"
am: 2aa0cdd1d2

Change-Id: Id5dfe845419d4b084decb6dab04f1e701068c4d4