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

[automerger skipped] Merge "Supported the legacy allowed initial attach APN types config" am: 02026532 am: 6aae9f52 am: cc9bcb7c -s ours am: 337b4f83 -s ours

am skip reason: Merged-In I08200da33e08bbb3729a66329a27fbcba7283141 with SHA-1 722fa326 is already in history

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

Change-Id: I1b1240ad49451f209cd8aa3d1e7f736531d2586c