Merge "Replace usages of ServiceState#getDataNetworkType"
am: 922ec35d28

Change-Id: Icbdeb12e752bfd77e8c818251b442acb93079f66