Merge "Add ContentionTimeStats into dumpsys" into sc-dev