Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev