Merge "Add isBatteryCharging to NetworkProviderInfo extras" into udc-dev