Merge "Add a carrier config for WFC's carrier name override by ef_pnn" into rvc-dev am: 29db7a6a

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

Change-Id: I3167d1972dd93c5f76d22c337dd057b01f7a589e