Merge "Fix CPU power bracket initialization when /proc/uid_time_in_state file is unsupported"