Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev