Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev