[automerger skipped] Merge "add slotIndex to cellbroadcastProvider" am: cf22fb95c7 am: 8dddbc09c3 am: edfbffdb1b
am: 083abd3fa0 -s ours
am skip reason: change_id I5d8706f8f4a6465c7903b1f34e42f96f4e2a8021 with SHA1 859f398cb8 is in history

Change-Id: I49df79721f7c606089838d3ed599a015a2b648e8