[automerger skipped] Merge "UE shows ef_pnn as WFC carreir name if spn is...

[automerger skipped] Merge "UE shows ef_pnn as WFC carreir name if spn is null." am: 4a2aef29 am: 50cf3721 -s ours

am skip reason: Change-Id I05151118e5e418962b8877a13054b0c29f92568c with SHA-1 032c84a4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347351

Change-Id: I645cd4889d848d12a257b570a447c1578427ee89