[automerger skipped] Merge "Supported the legacy allowed initial attach APN...

[automerger skipped] Merge "Supported the legacy allowed initial attach APN types config" am: fcda785d am: 30830e36 am: 19aa83a7 -s ours

am skip reason: Merged-In If3acbe92ed25d254c61947c4535e2bdc2613d7b7 with SHA-1 2dd6cbb5 is already in history

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

Change-Id: Ic3c07460678498e05e70d8229c02bcfa7fc59fef