Merge "Add dumpsys to PowerStatsService"