Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 2bb4966dab" into oc-dr1-dev-plus-aosp