Merge "Add fields to Cellbroadcast" into qt-qpr1-dev
am: 455fc80450

Change-Id: I156d824df5b99b4427a8c3b5d189ba207bca8a1d