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