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

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

Change-Id: I4f60fd2805b5a6668e2020ce99cdd269b764fc7e