Always show the battery percentage unless it is unknown am: 3f0250c3cc
am: fdce0878f1

Change-Id: I5d3eca6bb9a8c0c1f2f3d318f8452ae03ec7dd84