Merge "BatteryManager support dock charging 2/2"