Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc94 am: 00f50c6804

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

Change-Id: I34b2c776016345fef890f4ea09eb0acc86d8a021