[automerger skipped] Merge "Fix NPE when querying EF Uri with non-existent subscription" into sc-qpr1-dev am: 19196036a3 -s ours am: 8e76d1d901 -s ours am: e32b933b00 -s ours

am skip reason: Merged-In Ic214b46600759e2c73a90bc50ef971d80303055d with SHA-1 8151e2b159 is already in history

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

Change-Id: Ibbb13e4a54717ff51e0baac548c0bd85d94dc04c