Merge "Add ability to override carrier service package" into main am: 91eae412

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2691155



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