am 49d176e6: am 31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev

* commit '49d176e6aaafa45101d80bad5396124df1a161e9':
  Show charging speed on Keyguard