Partially reapply "Enable OEM_PAID and OEM_PRIVATE APN types"

This partially reverts commit 1de834a671dffc17dbd9a01956203016ae34e4e6.

Bug: 366194627
Test: m
Test: ABTD v2/telephonycomm/cts_telephony_tests
Change-Id: I62e903572dc088e1452be26ea37cd7ad752ae1eb
4 files changed