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

Change-Id: I3609737f8f9e0d6c6f6dc041a709bf7d72a092a4