Merge "Added disallowed APN types configuration support"
am: 13b0b1a73d

Change-Id: I6c66b42ba4e39005bb255a9d924aa518810d99f3