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

Change-Id: Ia1b460686066aae442d8f5b105b74057f88cc99f