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

Change-Id: If7f34bad3433d20223b3591dd2332c35ce4b11a2