am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev

* commit 'a2231a754b92eb79e4b667c8b40fd0390ebb6dfb':
  Show charging speed on Keyguard