Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e2169e am: 3154bb657b am: 84a074db36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554723

Change-Id: I108d585c792dbcca5094f2d432c66fab1b07c473

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

@@ -322,6 +322,15 @@ public final class AssociationState {
                 mActiveDuration = 0;
                 mActiveDurations = null;
             }
+            // We're actually resetting the common sources in process state already,
+            // resetting it here too in case they're out of sync.
+            if (mAssociationState != null) {
+                final SourceState commonSource = getCommonSourceState(false);
+                if (commonSource != null) {
+                    commonSource.resetSafely(now);
+                    mCommonSourceState = null;
+                }
+            }
         }
 
         void commitStateTime(long nowUptime) {