Merge "Fixed a few battery issues in SystemUI" into nyc-dev
am: 8fba3b395f

* commit '8fba3b395fe45510683ffc199a0101655274ee45':
  Fixed a few battery issues in SystemUI

Change-Id: Ic2bb6e80c8276b2029b26095514d1aeb37bbeedb