Merge "add slotIndex to cellbroadcastProvider" am: cf22fb95c7 am: 8dddbc09c3
am: edfbffdb1b

Change-Id: I43b5e1be2aa1d3ba721a8bcc305018b41b7543fd