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

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
  Adding slotId to certain Telephony broadcasts.

Change-Id: Ie7ba6572548e7951d3c864e241b49aa38d656dd3