[automerger skipped] Merge "Show PLMN if SPN is null or empty" am: efb39577
am: 4b20ea01 -s ours
am skip reason: change_id If58e2e3789c70f06f787b671592e75982e448448 with SHA1 b44c5415 is in history
Change-Id: I8720480afc0e7f32a4e5f155a9817095b73a82cd