Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d

am: 59a00010fb

Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa

services/core/java/com/android/server/net/NetworkStatsService.java

@@ -337,7 +337,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
                 powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
 
         NetworkStatsService service = new NetworkStatsService(context, networkManager, alarmManager,
-                wakeLock, getDefaultClock(), TelephonyManager.getDefault(),
+                wakeLock, getDefaultClock(), context.getSystemService(TelephonyManager.class),
                 new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(),
                 new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir());
         service.registerLocalService();