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

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

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