Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8
am: f2fabc9926

Change-Id: I73047338741bba452010957197c922ed1354f9a1