Merge "Fix NPE when querying EF Uri with non-existent subscription" am: 7483b1de20

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

Change-Id: I7d271ec60ed6a63334dfa636890fe28823591b2c