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

Change-Id: Ib0e9dad043ab31e417fee4eae1aafaccfae6fdc2