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

* commit '7cf4dd63ee6b97b0c7e1fff16f792c7a8e64146c':
  Adding slotId to certain Telephony broadcasts.

Change-Id: I86a4d88dfa07e68449188da6fe86351289a72417