Fix sample power profile

The sample power profile from the framework contains values that are not
actually read by the framework (cpu.speeds.cluster0,
cpu.active.cluster0).

At the same time the sample power profile is missing some values that
are read by the framework, like cpu.suspend, cpu.idle and cpu.active.

Issue: FP2P-272
Change-Id: I29469bc46745a709a8d5fbd04d71b54b54cf372a
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 899d630..e59f0e2 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -68,19 +68,26 @@
 
        There must be one of these for each cluster, labeled:
        cpu.speeds.cluster0, cpu.speeds.cluster1, etc... -->
-  <array name="cpu.speeds.cluster0">
+  <array name="cpu.core_speeds.cluster0">
       <value>400000</value> <!-- 400 MHz CPU speed -->
   </array>
 
   <!-- Current at each CPU speed for cluster 0, as per 'cpu.speeds.cluster0'.
        Like cpu.speeds.cluster0, there must be one of these present for
        each heterogeneous CPU cluster. -->
-  <array name="cpu.active.cluster0">
+  <array name="cpu.core_power.cluster0">
       <value>0.1</value>  <!-- ~100mA -->
   </array>
 
+  <!-- Additional power consumption by CPU cluster0 itself when running excluding cores in it -->
+  <item name="cpu.cluster_power.cluster0">0.1</item>
+
+  <!-- Power consumption when CPU is suspended -->
+  <item name="cpu.suspend">0.1</item>
   <!-- Current when CPU is idle -->
   <item name="cpu.idle">0.1</item>
+  <!-- Additional power consumption by CPU excluding cluster and core when  running -->
+  <item name="cpu.active">0.1</item>
 
   <!-- Memory bandwidth power values in mA at the rail. There must be one value
        for each bucket defined in the device tree. -->