Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am: 84f97e21b2

Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926