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

* commit '8dd3aaddba551eab19cf7ced07ab066575377c5e':
  Align carrier info for glowpad keyguard screen