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