Merge "Add a carrier config for WFC's carrier name override by ef_pnn" am: 44d15f6905

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

Change-Id: I54ad14a9e74fb3cbc1a1ee7551b11d01231d7d63