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

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

Change-Id: I5684f1b05e59783e535f16af5e0f7feebe8103e8