[automerger skipped] Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc am: 00f50c68 am: f00c01a5 -s ours am: b4785234 -s ours

am skip reason: Merged-In I3ac0ef4b7ee9640f57bfc62e639e4b6a6b89e1ef with SHA-1 52895c12 is already in history

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

Change-Id: I15b1b6064554459df31a1df9ef24d39b25f57129