Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"