Merge "ProcessStats: fix uss average value offset"

core/java/com/android/internal/app/procstats/PssTable.java

@@ -96,7 +96,7 @@ public class PssTable extends SparseMappingTable.Table {
             }
 
             val = getValue(key, PSS_USS_AVERAGE);
-            setValue(key, PSS_AVERAGE,
+            setValue(key, PSS_USS_AVERAGE,
                     (long)(((val*(double)count)+(avgUss*(double)inCount)) / (count+inCount)));
 
             val = getValue(key, PSS_USS_MAXIMUM);