Merge "Fix a bug where slotId was used instead of subscription ID" into main am: f7696d07b8

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

Change-Id: I84426ddfa086bdfef042221b9023e1cf83ac5898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>