am 4fa46485: Merge "Update dumpsys power output." into jb-dev

* commit '4fa4648515c3c1f77a31da186a9fe31d6c509412':
  Update dumpsys power output.