Merge "BatteryStats: Fix issue where network traffic accounting might be lost" into nyc-dev

core/java/com/android/internal/os/BatteryStatsImpl.java

@@ -8192,7 +8192,8 @@ public class BatteryStatsImpl extends BatteryStats {
                             + " txPackets=" + entry.txPackets);
                 }
 
-                if (entry.rxBytes == 0 || entry.txBytes == 0) {
+                if (entry.rxBytes == 0 && entry.txBytes == 0) {
+                    // Skip the lookup below since there is no work to do.
                     continue;
                 }