Merge "Remove BatteryInfo from settingslib"