Merge "Move the logic of batteryMeterDrawable to settingslib"