Partially reapply "Enable OEM_PAID and OEM_PRIVATE APN types" am: 695ca37b02

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

Change-Id: I620e2888c1da4cc8a6f74c11911041b9c46d1240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>