Merge "Merge "Add a carrier config for WFC's carrier name override by ef_pnn"...

Merge "Merge "Add a carrier config for WFC's carrier name override by ef_pnn" into rvc-dev am: 29db7a6a am: 778a866f am: 51ff8525" into rvc-qpr-dev-plus-aosp am: d1f4e919

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

Change-Id: If242ea52f57f966d6a4a04262d88ec539a539969