Fix handling of URIs with subId

Bug: 69419776
Test: manual and TelephonyProviderTest.java unit tests
Change-Id: Ib0e053be5a2f00179037e0df09ff1347b3443cb4
Merged-In: Ib0e053be5a2f00179037e0df09ff1347b3443cb4
3 files changed