[automerger skipped] Merge "Fix NPE when querying EF Uri with non-existent subscription" into sc-qpr1-dev am: 19196036a3 am: 821ac96772 -s ours am: 1dba49f16b -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: I9103241c1310062c63d18afde0699a00670811a9