Merge "BatteryMonitor: support Dock charging"