Merge "Do not destroy UCE when associated subId changes with the same subid" am: 7da1b8edbc

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

Change-Id: I1a214441d0d2d1713ed2e233f8e5198cc8e2ba06