[automerger skipped] Merge "Add ApnType.ENTERPRISE" am: 21258c3e am:...

[automerger skipped] Merge "Add ApnType.ENTERPRISE" am: 21258c3e am: 48ecb65f am: 1876b726 -s ours am: 7fdb844a -s ours

am skip reason: Merged-In I917beddabed0a7d54a62b6c203229d201db76e0f with SHA-1 75f3dfa3 is already in history

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

Change-Id: I89cbc42c716281deb50c5ddeb52eed146196a3e7