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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05b739157ab041d18957d5be9b00192f222c3dca