Merge "Fix potential failure when per-procstate cpu times tracking is turned on." into p-keystone-qcom