Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev