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

Change-Id: Ibf29269e9e0514fe3604f6fa0a2056b0a44c211b