Merge "Fix creating the UceController instance associated with the invalid subscription ID" am: b026205d2e am: 02aa1f9314 am: 19fee4c96f

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

Change-Id: I46a63210be7cec267c1f3f85412ed186f0d4ce29