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

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

Change-Id: I8042397f6f4f2975e308c46257c5c90c9740143e