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