[automerger skipped] Merge "Simplified the initial attach APN logic" am:...

[automerger skipped] Merge "Simplified the initial attach APN logic" am: 8359ebec am: e726dcec am: 78242fa2 -s ours am: 2de6a5d7 -s ours

am skip reason: Change-Id I9fbf4f270726cba1281770db88fec7c1bb62e6db with SHA-1 0bebba73 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc94cc9070d994646b3e7e24ad193b090d3c1130