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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef6f466e4fd872f3a643a4d21b55350a7be3042