am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev

* commit 'a1a51272eddc842277e4ec10bdd3fed9b16ce866':
  Align carrier info for glowpad keyguard screen