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

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

Change-Id: Ia85c936fb197696ff329c600efa627c0d642d45c