Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1
am: 84e84a73b7

Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0