Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 736cb0e33a

Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a