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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf0689e1e2290dd1fc039860890042fe72a6f4c8