Merge "Hold wifi and mobile interfaces since boot in NetworkStatsService"