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

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

Change-Id: Iec542cc1d218850cbdc12ea0378fe5aeb8750d61