[automerger skipped] Merge "Add a carrier config for WFC's carrier name override by ef_pnn" am: 44d15f6905 am: 7b3426f5f4 -s ours

am skip reason: Change-Id Id72ce2a9a0fb8f45efa8a975e8052808f726a971 with SHA-1 d1b164401e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347352

Change-Id: Ieb2b692d1c017a392c901d734f462002bb19bc14