[automerger skipped] Merge "CDNR use ef_pnn as wfc carrier name if spn is...

[automerger skipped] Merge "CDNR use ef_pnn as wfc carrier name if spn is null." am: 39856829 am: ed46d0d1 am: f8bb4da5 -s ours am: 5ad7afdf -s ours

am skip reason: Change-Id I1935b76d20c01e0e8c7f2e1c80139b6bd1693bfc with SHA-1 421fd949 is in history

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

Change-Id: I7a7d2b0a834337d72e96b972705f142377d8ff02