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

* commit '7f08dcd927e40cdca9306d3517e8fb3115bd6ef2':

Change-Id: I70b944226d4c951144a0e02517a4cf63069ffb0d