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

Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c