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

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

Change-Id: Idc215e8f3ac2ccc198060214dba345b0b7b6383c