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

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

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