Merge "Fix carrierconfig shell command is not working when slot is specified" am: 5647246964 am: a713942162 am: a8ba5fbd49 am: 9d1ed522a2 am: bf13322223

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1425512

Change-Id: I7ebb252a0173ce3ba0d0712a6dc9d12e25e731e2