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

Change-Id: I9c8acbcd54de834dd751971c71a8500de8206ec1