Merge "Revert "Enable OEM_PAID and OEM_PRIVATE APN types"" into main am: 0cccbfad49

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

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