Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1 am: 84e84a73b7
am: 46c9c133e0  -s ours

Change-Id: I79cb760c9b67874ed3b610743727a28f55bbe2c6