Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e00f5aa8eec8fb3246a375f002820338d4572f

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

@@ -143,6 +143,10 @@ public abstract class KernelCpuUidTimeReader<T> {
      */
     public void removeUid(int uid) {
         mLastTimes.delete(uid);
+
+        if (mBpfTimesAvailable) {
+            mBpfReader.removeUidsInRange(uid, uid);
+        }
     }
 
     /**