[automerger skipped] Merge "Do not destroy UCE when associated subId changes with the same subid" am: 7da1b8edbc am: 96a0e00f9f am: 49aba4368b -s ours

am skip reason: skip tag Change-Id Ifc2b7fc9b0580ee3d0327501b87ccd2f62e81242 with SHA-1 4aa8b07f0c is already in history

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

Change-Id: I313860ef75fddbf8dfb3285ca0402cbc7afea6cc