Merge "BatteryStats: NETWORK_TYPE_NR support"