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

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

Change-Id: Iaf4234bd2087e4c812f5a89185edb3c79e59d182