Merge "Added extra logic for selecting APNs for a subscription" am: ec58c61ca7 am: f624a991d3 am: 08de863939 am: 67806ff88e

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

Change-Id: I262a2db9ad23b50b1884e426787305c6b1b0961f