fixup!^2 BatteryMeterView: Hide icon on battery-less devices

This reverts commit 394833715db64f750bea77aa44f79ce11ea67673
and fixes commit 4d1a86996c51fc22a20e2652b054f7fff274b295.

Change-Id: I117883d945f64aec1f9fc45d4206d59861dea1d9
3 files changed