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

Change-Id: Ib465b805a806575f32d5f5ed173e8da3e5aa951a