[automerger skipped] Merge "Added preferred APN logic back to IA APN...

[automerger skipped] Merge "Added preferred APN logic back to IA APN selection" am: 4e6ce8ba am: 277bdbde am: 423bcb33 -s ours am: 3ed91a93 -s ours am: 1f2e3196 -s ours

am skip reason: Merged-In Ide3bda2b637f66aef6115139eeb971342dbcfaa9 with SHA-1 9ea5a8d8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1699288

Change-Id: I56a3129c37f7ea13dfc8a04a0352f2f0ff0b4f49