Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am: 29091ec55f" into oc-mr1-dev-plus-aosp
am: 383551da86

Change-Id: I9303dbda0f4d82c161d8cddacc8d3a56ebe1d52c