am 9f1ee090: am 1d2b4cb1: am 0704702d: Merge "Add new columns corresponding to Cellbroadcast settings screen." into mnc-dev

* commit '9f1ee0906adce31cb6c83e06c03439193b8ffa76':
  Add new columns corresponding to Cellbroadcast settings screen.