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

* commit '1d2b4cb16c29d5ab4c6101c80ba1ecc9c6f771ab':
  Add new columns corresponding to Cellbroadcast settings screen.