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

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

Change-Id: I2144e25d2faac71f49685b1c21215601020fda7d