Merge "Added disallowed APN types configuration support"