[Telemetry] Fix application_energy_consumption output.

tools/perf/metrics/power.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import time
 
 from metrics import Metric
 from telemetry.core.platform import process_statistic_timeline_data
 from telemetry.value import scalar
 
@@ skipping 84 matching lines @@
     metrics here which is why there are plenty of checks for 'is not None'
     below.
     """
     if not self._results:
       return
 
     application_energy_consumption_mwh = (
         self._results.get('application_energy_consumption_mwh'))
     total_energy_consumption_mwh = self._results.get('energy_consumption_mwh')
 
-    if not application_energy_consumption_mwh and total_energy_consumption_mwh:
+    if (PowerMetric._quiescent_power_draw_mwh and
+        application_energy_consumption_mwh is None and
+        total_energy_consumption_mwh is not None):
       application_energy_consumption_mwh = max(
           total_energy_consumption_mwh - PowerMetric._quiescent_power_draw_mwh,
           0)
 
     if total_energy_consumption_mwh is not None:
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'energy_consumption_mwh', 'mWh',
           total_energy_consumption_mwh))
 
     if application_energy_consumption_mwh is not None:
@@ skipping 68 matching lines @@
       continue
 
     assert isinstance(cpu_stats[process_type]['IdleWakeupCount'],
         process_statistic_timeline_data.IdleWakeupTimelineData)
     idle_wakeup_delta = (cpu_stats[process_type]['IdleWakeupCount'] -
                         start_cpu_stats[process_type]['IdleWakeupCount'])
     cpu_delta[process_type] = idle_wakeup_delta.total_sum()
     total = total + cpu_delta[process_type]
   cpu_delta['Total'] = total
   return cpu_delta