Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev