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