[automerger skipped] Supporting moving from a single sim to a DSDS and vice versa am: 3971002758 am: 5edd30553d am: 4d07af73a2 am: f2a6269b54 -s ours

am skip reason: Merged-In I26b386a6b69638aa8229b285300188a1249e33c7 with SHA-1 d6ee815fd5 is already in history

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

Change-Id: Iefdc08dd554a4d9f48a5b2a5d6f178bdf41de9a4