Merge "Add ApnType.ENTERPRISE" am: 5ee0d1534e am: e79c63ef15

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

Change-Id: Ifb6472321ba2ca2ecbb7962563c115760b8dd09f