[automerger skipped] Merge "Add ApnType.ENTERPRISE" am: 5ee0d1534e am: e79c63ef15 am: c5314857d5 -s ours

am skip reason: Merged-In I718ff225c7fc9b9667f6360ae623e5d8bbf1f03c with SHA-1 9918ede8ce is already in history

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

Change-Id: I6256d94f7cfbbd9fc4f74753ce73ec8774f7ba98