[automerger skipped] Merge "Simplified the initial attach APN logic" am: a849c283 am: a9931ea4 am: 5804071e -s ours

am skip reason: Change-Id Iaaaabbfc2010d2a281165313fdc104f729731f70 with SHA-1 182d412b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7de3f98095262d1498ca14f89e9afdc987a10b0