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

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

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