Revert "Revert "Fix battery % always showing at < 100%""

This reverts commit e5e4338582dd4ce24e4faa536176b4f9349ed023.

Change-Id: Iea1c4b4e9e40562678bc6bffa383f4943c9e0cdc
Merge "Revert "Revert "Fix battery % always showing at < 100%""" into lollipop