Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev