Merge "Simplified the initial attach APN logic" am: 8359ebecc3 am: e726dcec1b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b58785a89857802373e585f964609cc4e009976