Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev am: 3f6e211
am: 54cf95f

* commit '54cf95f618301ed443819b73b4c292a199d95d95':
  Adding slotId to certain Telephony broadcasts.

Change-Id: I75612fbfe4bcd5a4c3d6f9f9073de6d05f8ce80d