Merge "Fix NPE when querying EF Uri with non-existent subscription" into sc-qpr1-dev am: 19196036a3

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

Change-Id: Iad8349d61420a4a1445a98b7dc47b826c47eb9dc