[automerger skipped] Merge "Add a carrier config for WFC's carrier name...

[automerger skipped] Merge "Add a carrier config for WFC's carrier name override by ef_pnn" am: 44d15f69 am: 7b3426f5 -s ours am: 07da09c4 -s ours am: af15627d -s ours am: 85bc5df0 -s ours

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

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

Change-Id: Ia9adaa7e1c39b6e082826b0c621defa45e77cb9e