Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc94

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

Change-Id: I8a38f7bd32831e5bdc829c61db923527238cd9cd