Merge "Revert "Enable OEM_PAID and OEM_PRIVATE APN types"" into main