Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev