[automerger skipped] Merge "Add ApnType.ENTERPRISE" am: 5ee0d153 am:...

[automerger skipped] Merge "Add ApnType.ENTERPRISE" am: 5ee0d153 am: e79c63ef am: c5314857 -s ours am: 39af518f -s ours

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

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

Change-Id: I3545b8443973f178f252c2009ebd02a89244031b