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