Change TelephonyRegistry to use phoneId as a callback condition.

Previously subId was used but it is currently not consistent and
can take on dummy values thus callbacks would not be called appropriately.
Eventually I hope to remove the dummy value concept but for now this
looks like the best approach.

Bug: 16148026
Bug: 15973975
Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4