Merge "[Mainline] decouple ServiceState.getDataNetworkType()" am: 5bdafbf9ce am: 058b6f80cd

Change-Id: Ic371072ece414d481b0bb6e7670f74ef48e200b2