Merge "Add ApnType.ENTERPRISE" am: 5ee0d1534e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1955202

Change-Id: I2a00d2ab13d795ccf422b35a54ceffae941a04d8