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

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

Change-Id: Id27d6611cefe62e998fbb92ba201c62e6982ca5f