am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev

* commit '11184922d30f468bf97a2e20a3aeff7e1ae7ca54':
  Fix battery level quick settings tile bug.