[automerger skipped] Merge "Fix carrierconfig shell command is not working when slot is specified" into rvc-qpr-dev am: 086766108c -s ours am: 1798d1f278 -s ours

am skip reason: Change-Id I71bdb767c2e2e999adc27deb9eb1618589859360 with SHA-1 f25799b477 is in history

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

Change-Id: I1111550ffb4629809c6c74b4dc1b0da36bcd03b6