Merge "Add CarrierConfig key to provide service numbers via CarrierConfig." am: 2fef8f6e9d

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

Change-Id: I03323d388f669c25196dc1a38dd9e653b806e0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>