Put PLMN and SPN on one line in the notification panel.

We now match the keyguard's presentation: either plmn, or
spn, or "plmn|spn" (concatenated with a pipe).

Bug: 6639047
Change-Id: Ia6ae9085fbf2fe9fa4465a6f7825cb997db5e6c5
2 files changed