Merge "Add tests for BatteryMeterDrawable"