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

Change-Id: Iae01caa1a471d79d4a2a6c5f64c7c1280c9c38df