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

[automerger skipped] Merge "Simplified the initial attach APN logic" am: a849c283 am: a9931ea4 am: 5804071e -s ours am: e275dcc5 -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: Ib0a80b82e20947587657d2893744b9bbb93c1e9c