Merge "Fix invisibility of status bar icons in call barring settings" am: 77b813de9c am: 525e8b0c43

Change-Id: I9df972464d9c32c52aa5023d23df94378b412d4b