Merge "Disable voice call barring notification for Verizon." into oc-dev am: d1d3cdcd4f
am: 692ed97d87

Change-Id: Iced9ec804cd527a15621721308ec5106cc031f52