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

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

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