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

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

Change-Id: I2a45ae9c1abe158e2f45c9809684ebb878f29bc7