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

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

Change-Id: I413f6258b1bc6420ca1ef64795c77c110ef33eb9