Merge "Added extra logic for selecting APNs for a subscription" am: ec58c61ca7

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1853050

Change-Id: I8f3a7dfb9ac1db743d964c4143ea4ad71c9f1ba9