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

Change-Id: Ifefddf01b24283bdeca54a8cc9442f69b1949cb7