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

* commit '6a308f1f8271fbec7c58a2aa32eea93f02d2cb34':
  Adding slotId to certain Telephony broadcasts.

Change-Id: Iafd013bbd8e64547ca55f2722f9ab1a7dc4cd14c