am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev

* commit '56b135b91051664ae9027f50e9f20b7fcf6565ba':
  Put PLMN and SPN on one line in the notification panel.