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